From e03f6e62c8e9c6532bab15219c1da41376c16232 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 2 Feb 2007 16:04:11 +0000 Subject: [PATCH] linux: Allow xenbus_strstate() to be used from modules. The function is referenced by a number of DPRINTK()-s. Also, properly const-ify it. Signed-off-by: Jan Beulich --- linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c | 5 +++-- linux-2.6-xen-sparse/include/xen/xenbus.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c index f294ec1cc9..49878d17e0 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c @@ -42,9 +42,9 @@ #define DPRINTK(fmt, args...) \ pr_debug("xenbus_client (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args) -char *xenbus_strstate(enum xenbus_state state) +const char *xenbus_strstate(enum xenbus_state state) { - static char *name[] = { + static const char *const name[] = { [ XenbusStateUnknown ] = "Unknown", [ XenbusStateInitialising ] = "Initialising", [ XenbusStateInitWait ] = "InitWait", @@ -55,6 +55,7 @@ char *xenbus_strstate(enum xenbus_state state) }; return (state < ARRAY_SIZE(name)) ? name[state] : "INVALID"; } +EXPORT_SYMBOL_GPL(xenbus_strstate); int xenbus_watch_path(struct xenbus_device *dev, const char *path, struct xenbus_watch *watch, diff --git a/linux-2.6-xen-sparse/include/xen/xenbus.h b/linux-2.6-xen-sparse/include/xen/xenbus.h index a26ca12820..cbf6fe351d 100644 --- a/linux-2.6-xen-sparse/include/xen/xenbus.h +++ b/linux-2.6-xen-sparse/include/xen/xenbus.h @@ -295,7 +295,7 @@ void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt, int __init xenbus_dev_init(void); -char *xenbus_strstate(enum xenbus_state state); +const char *xenbus_strstate(enum xenbus_state state); int xenbus_dev_is_online(struct xenbus_device *dev); int xenbus_frontend_closed(struct xenbus_device *dev); -- 2.30.2